NetworkMenu: keep the connection list visible when connecting...

When a device is connecting, we can continue showing available
connections and access points, as well as the active one with the dot.
(Hiding was a remnant of when the device status was on a different
menu item than the title)

https://bugzilla.gnome.org/show_bug.cgi?id=646381

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index c78b08b032faf079c54667c7a9fb7b93cda4347a..1bb73e7d3c0165f9dd9caa9c6222b7872d5e307b 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -557,8 +557,7 @@ NMDevice.prototype = {
     },
 
     _shouldShowConnectionList: function() {
-        return (this.device.state == NetworkManager.DeviceState.DISCONNECTED ||
-                this.device.state == NetworkManager.DeviceState.ACTIVATED);
+        return (this.device.state >= NetworkManager.DeviceState.DISCONNECTED);
     },
 
     _createSection: function() {
@@ -1809,14 +1808,9 @@ NMApplet.prototype = {
             if (a.default6)
                 default_ip6 = a;
 
-            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING) {
+            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
                 activating = a;
 
-                // don't set activating connections to devices, NMDevice:state-changed
-                // should take care of rebuilding the menu
-                continue;
-            }
-
             if (!a._primaryDevice) {
                 if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) {
                     // find a good device to be considered primary